Snap for 4598635 from 00be81f3bc0797e1b14cfdcca373a51c0048d30d to pi-release

Change-Id: I5ebe179352c9d87ddf3b4e4f2a660f97afa5cecd
tree: 23af32e90515a20f13b513040a4f01b20acc1686
  1. android/
  2. androidx/
  3. com/
  4. Android.mk
  5. NOTICE.txt
  6. source.properties