Snap for 4790189 from 7fb380c2179aea38aeb4ce178ad5f34eff5704e1 to qt-release

Change-Id: If5c05504116ddbb1920ff0506f315330b6928c33
tree: a4636c88be1c98afa11b74991cb57772fdbb07bf
  1. java/
  2. Android.mk