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

Change-Id: I56b48d14b75cdc99192341747323e1552195fea0