merge from open-source master
tree: f1b1d48265b4a4367e1660770be0d5587abc7a31
  1. pico/
  2. picolanginstaller/
  3. Android.mk