Merge "Replace short with int16_t."
am: 34affaed9c

Change-Id: I03993dd0c16107f4d0b77f6703b2dcece8a8ecd4