[automerger skipped] Set the top bit for tagged pointers. am: 8dceacc296 -s ours

am skip reason: Change-Id I94a6821a82ce7ead59e6ca2dd113a5a50ee9e56b with SHA-1 b125ca48de is in history

Change-Id: I152b35e29b4055933b475a117e3219d8edc02d5e