Merge changes from topic "native_bridge_for_app_zygote"
am: 5f30976b8c

Change-Id: I45f72fec13fa586eee1b9d2d97d7f0a06dd0877e