Merge "Add tagged pointers to bionic." am: 3ff4245c70

Change-Id: I2183adf5e02a0dd236663884d83e4dd21bb7772d