am 669841a3: Merge commit \'e00eb88c\' into manualmerge

* commit '669841a3bf194c263e305e9018839e6f1313dbb0':
  Move 64-bit headers/libs to android-21
tree: eed8f795578786c113abffab5e9c93375fb26c6f
  1. 4/
  2. 5/
  3. 6/
  4. 7/
  5. 8/
  6. 9/
  7. Android.mk
  8. CleanSpec.mk