[automerger] CTS/STS 32-bit and 64-bit test macros am: a9cc61175d am: 14850ff87a

Change-Id: I1c9bd7b45a78beb2474c5cb6fa1bb8388ac5d511