am d08728aa: Merge commit \'a3d7e61812f8d68ca109280c4e7589e4f968723a\' into HEAD

* commit 'd08728aa5050ca03b6954ddb708146e16c1fb53a':
tree: cf0dae124eb25c5de4ecf8e54060dfdd07c7f1b7
  1. java/
  2. Android.mk