Merge "Remove ro.bionic.ld.warning." am: bda45088a2 am: 86ca29ee67
am: a87e9b1b0f

Change-Id: Iad1e6427e9cb9a0189ad5ba27a2f034464c1275c