Snap for 4759746 from 93f5ff09ddd91bb67bcdc77478848ed20f30573e to pi-release

Change-Id: Id3c6ad8a7955f4d354d59e85acbb08963b508bd9
tree: e9c11cea082491e8e3bf11cfc7fee959b48ffdb6
  1. java/
  2. Android.mk