Snap for 4585119 from b8f10ec3063fd18bfc4794456c71f3f6488dae62 to pi-release

Change-Id: I65b2f9a53e24dc1243a8b635073f13cfc236d129
tree: c125dd04c1927ce8b7fcb102156391b002b2b427
  1. java/
  2. Android.mk