Merge "Add tagged pointers to bionic."
am: 3460b6c265

Change-Id: Ia9c11b17acdd1b766aa44ba7249df21b6ef343e1