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

Change-Id: I9ab55e01d77d2f6e94bd43894d48a6d68ef2d8d1