[automerger skipped] Only retain for 64 bit. am: d3a7616aa2 -s ours

am skip reason: Change-Id Iaec8276582f880145a1ca5ebbaa65789f46d2bf2 with SHA-1 42ee32379d is in history

Change-Id: Iea34a6e0143695b0f065cf633b8d768e8ab5ea00