Merge changes from topic "o-mr1-hal-freeze" into oc-mr1-dev

* changes:
  O-MR1: HIDL freeze-commit
  Move auto hash to right location in current.txt.