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

Change-Id: I88ff410a2ed82faea9c6e92e2660b0297655e176