Merge "Move default native bridge value to build.prop" am: e7a0516835 am: 77492a72a2
am: 76e2b22796

Change-Id: Id41033af929bbdd8c9bab4b8f24debaeb502cc1a