Merge "Revert "Add tagged pointers to bionic."" am: 5c9efd1d66 am: 17c01113a3

Change-Id: Id450e984271ed2573bb97dc245466500b5d37692