Merge "Add template for 1.3 types.hal and regenerate it"
am: 60d2ea9694

Change-Id: I5a510772ec6018dac2eb22b8e12a6e81243dbe56