am 108b44c1: am bcae2556: Merge commit \'77db2216fd4cf7464089fcc24ebd543413dcade3\' into HEAD

* commit '108b44c175dfbfd61938a7bc965f420be86349cc':
tree: 3f8bb281487caae5b4965bbb90057db09cbba161
  1. src/
  2. android-fixes.h
  3. Android.mk
  4. CleanSpec.mk