Merge "NFC: Add Annotations to the HAL file"
am: 3bca1eef75

Change-Id: I528f0494291c89116a976a8da0c28dd3dc87e6cb