Merge "Fix full_x86-eng build."
tree: 177ac37c59e8e057f70fc1dd4baefd6703ffe5db
  1. main/
  2. unittest/
  3. Android.mk