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

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

Change-Id: I030f36f1633d43211c7b6fb9663e8773a4fc5045