[automerger skipped] Merge "Add template for 1.3 types.hal and regenerate it" am: 60d2ea9694 am: c0dd9168fc am: f4f079c952
am: a2fd282d2e -s ours
am skip reason: change_id If707dfbcade6be1a0885fc21f6ddf47f3c27b244 with SHA1 e98e6793be is in history

Change-Id: I9a0da38245ab290f759f359bb65449053efdd536