Merge "Make __libc_init_malloc weak-for-native-bridge"
am: b7cee4ebad

Change-Id: I932d917b27c264aa4cf0f4e1f21f91ba276121fd