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

Change-Id: Iba7d16624a518158a8cbe5de0dc94dc0ccf747fd