Merge changes from topic "update-pointer-context"

* changes:
  Rename AoD to Aod
  Adjust TestHal.java to the updated PointerContext