Snap for 4620899 from ed2bd5518c1845a24cd66ec3cfa1aa64c2e242d6 to pi-release

Change-Id: I4ae7d47a17a9552b92b8cead1f4da151653da785
tree: 781ff0cb8272d64b42d954d00bfec95bff89e8a7
  1. java/
  2. Android.mk