Merge "Make __libc_init_main_thread and android_set_abort_message weak" am: 1b6de878 am: e1427eac am: 3da3b9aa Change-Id: I169eef02889623b0b34a2c188f9eeafc5783de42