Merge "Track libcore commit a2d9879b" am: 4aa106a790 am: b89ec268ab
am: 3dcac86f4c

Change-Id: Iefcd20cd6d268006357aea346fbfd683865f3955