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

Change-Id: I62c89f74b52d76cadbdabe140cb04b3db40acdca