Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 787b1fd397
am: d3bd55ff36

Change-Id: I5634d7f941eb68ae2c60074dc35483b8d70249e0
tree: 8299aa3d41762236a28e4c53fc7de5cf1ebc8676
  1. common/
  2. dictionaries/
  3. java/
  4. native/
  5. tests/
  6. tools/
  7. Android.mk
  8. CleanSpec.mk