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

Change-Id: I34838be329867495cce6108472fa94ef09285c02