[automerger skipped] Only retain for 64 bit. am: d3a7616aa2 am: ae06453fb8 am: 45117afe65 am: 21acbb987d -s ours am: 863cc44626 -s ours

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

Change-Id: I3e1f37723e8d551c6ce70a735039832644fda2d3