Merge changes from topic "native_bridge_for_app_zygote" am: 5f30976b8c am: 20d518fdb9

Change-Id: Ibd2ae5bc56ccfd663ca0801a7b54ef2592dace28