Snap for 4434599 from ff6e209b15f0da19493a1d057fcfa1c5b3881dc6 to pi-release

Change-Id: I06ba4030f79f7d46db471989a7712f672a56b602
tree: 5258476de0e5b2ce863c7e231ae370a097e3b93b
  1. java/
  2. Android.mk