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

Change-Id: Idb59f403283b3b04c584f1f614746672673fba84
tree: 7a6de1274e100a466f3f340510c8d23cc967ffd6
  1. Android.bp
  2. CleanSpec.mk
  3. src/