Merge "Fix to issue with NFC VTS-CoreInitiazed test" am: 827d708109
am: 76204acc2a

Change-Id: I809ee66244fe0b0fc947be5a467dccd18b098f02
tree: f15ee8eb7f49ddb28bb3475ca385aa6dfeb58f1f
  1. 1.1/
  2. extns/
  3. halimpl/
  4. Android.bp
  5. OWNERS