Snap for 4462748 from ea0884e2ee2315aa10983a7ceeb8411414907e9d to pi-release

Change-Id: I6597446f51a318f5d833d9436ce322e6d740eca3
tree: 17eb24a3858656bdcc65296d9ca631e720f99379
  1. android/
  2. com/
  3. Android.mk
  4. NOTICE.txt
  5. source.properties