Replace short with int16_t.

Bug: 112478838
Test: build with WITH_TIDY=1
Change-Id: I6618efb1b005dd4194c010da9101d7899c40d30d
2 files changed