am 3711df3c: Merge "Fix full_x86-eng build."

* commit '3711df3c1fbd2d310eb4f742a539913a3b5ce0af':
  Fix full_x86-eng build.
tree: 177ac37c59e8e057f70fc1dd4baefd6703ffe5db
  1. main/
  2. unittest/
  3. Android.mk