am f0268081: Merge change 20019 into donut

Merge commit 'f0268081f04a8d7c931e3481b433576f2b54685e'

* commit 'f0268081f04a8d7c931e3481b433576f2b54685e':
  Integrate unsubmitted cupcake change 131132:
tree: ad6ad483aa07e218bc264b29b35c2ffd349934db
  1. tests/
  2. tools/
  3. Android.mk