Merge commit '1ced0c293583281141c6bf0ab694edff810c19e7' into HEAD

Change-Id: I1da9335d26d418de026c25d59aa6ee43af6d602c
tree: 5258476de0e5b2ce863c7e231ae370a097e3b93b
  1. java/
  2. Android.mk