am b489dba5: (-s ours) Merge "DO NOT MERGE: Fix full_x86-eng build."

* commit 'b489dba5b127a8f162bbf08085f23899586f4ac9':
  DO NOT MERGE: Fix full_x86-eng build.
tree: ab6c66050225288f9c4074975010e4828b88fb71
  1. main/
  2. unittest/
  3. Android.mk