Merge "Add lp32 and lp64 shorthands to SYSCALLS.TXT."
am: 40538268d4

Change-Id: I77a1a376ddb86a5b6b9f60de3db23de00861f72b