Snap for 4816034 from 5f34ed7965ef5bb939a9083ad35c383e671f8035 to qt-release

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