Merge "Remove definition of 32 bit abi."
am: 972d1ec532

Change-Id: Ide33c29907f06b5ac56c75e243cc283834149e63