[automerger skipped] Add int16_t to MixedTyped am: ed7ce7afdf am: 4f936dfa4f
am: 1c0655453d  -s ours

Change-Id: I83b52e1a9d2174b5f7478a75318036eea2ad35f4