Merge "Replace short with int16_t." am: 34affaed9c am: 62d118a444
am: c01ce1b637

Change-Id: Id1d9e84ced16d7c13d1f6f7b1014bc61fa252b95