Fix build issues after the merge

Change-Id: Ia856311187a0b2168cb859bd8b2300ff59df6569
6 files changed
tree: 623afc0442352bf9b2a01f0ff6d03ca35ace8e57
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE