Merge "API review cleanups." am: 624fe0ea1e am: a52da8332b am: c066723201

Change-Id: I927414e3897da9adefe8c94d9a70f05158f71dd3
tree: 25fae956fb3bf96d4b9580620e1852596d793cac
  1. src/
  2. Android.bp
  3. CleanSpec.mk