Snap for 4818218 from 289d73b5287089e3d2584f1bac8884fce2e4d36b to qt-release

Change-Id: I05f47e3030652b62516b03dffd97c8f736d0dd09
tree: 3a5c9c6dc299819de04cee113981e12a81b7a65c
  1. java/
  2. tests/
  3. Android.mk