Snap for 4784261 from 3ba232bcf0c1fcefc7f573a4ca8b293054ec8e4f to pi-release

Change-Id: I2cfd126dffdf77e9d7b8adae6266db9fc350e20b
tree: a4636c88be1c98afa11b74991cb57772fdbb07bf
  1. java/
  2. Android.mk