merge from open-source master

Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d
tree: ccd32ebd35cda1e4521b6c3383a10955620f9e7e
  1. bridge/
  2. create/
  3. .gitignore
  4. Android.mk