Merge "Replace (unsigned) short with (u)int16_t."
am: ba028636ba

Change-Id: I8bb2e714147157657ad79b7cbc1bffe3a24c5771