Snap for 4767765 from 2c002de63839a7ce1ed334af2c75176c00e1e248 to pi-release

Change-Id: I374d7500bd788530d544402409af579ae3befde4
tree: 501033389b2436f56a250bc3a39c62c736f68f87
  1. java/
  2. Android.mk