Fix sdk_x86 build

(cherry picked from commit 26b8c9d432adc2fc71438050377cb6106dffde1a)
(cherry picked from commit 2fc2bd6aaa1c9a743f2d2bb9d81ab1570e510923)

Change-Id: I20a705cb83279ff6b6fdc4a543853e020eb34a04
4 files changed
tree: 08de76e8593224201f7cc0fcf549e474a2f00405
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk