Snap for 4942340 from c228fd4d564918ad4acefbd53de3120528f281cc to qt-release

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