Merge "Framework: Disable native-bridge for non-zygote" am: 05c09faad2 am: 5b2e5d32d6
am: 779378fab0

Change-Id: I4a3363b247b934b06fe794bbf0a9a3382202b6ce