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

Change-Id: I03b64700151305e66bb4cca82482050a658831c0