Snap for 4407698 from ef5237bdc44680bb6ced97a8df7721ee8cc0ae4a to pi-release

Change-Id: I814ae532ea31d2662265cd582bda331b5035a3ff
tree: ecb0e9a80a3d94ec64f79f3d7b1cbd188ba1de32
  1. java/
  2. Android.mk