Merge changes from topic 'post-apocalypse'

* changes:
  Revert "Invoke HIDL for C++ files"
  Revert "rename .hidl --> .hal"