Merge QPR1.180718.001

Change-Id: I68af296fe0824195c0ae35bf3f800e979656a0d1
tree: 17e395ea2a319649ffe557eb1e4ca706546d316e
  1. java/
  2. tests/
  3. Android.mk
  4. build.gradle