Merge "NFC: Add Annotations to the HAL file" am: 3bca1eef75 am: 3007940bda am: 2c54eef738
am: 0663b00143

Change-Id: I1e5a734e4acd5c37d41dcb8d792538d17c6b8b84