Snap for 4615953 from fd8ac1653de128a34863df01eab67c409032e6cd to pi-release

Change-Id: I832f118faab34dc2668e2b727ba4179bb35e4971
tree: 74cc47668b4f7c62d7eb86fbe7e5a177a72887b3
  1. java/
  2. Android.mk