Merge "keep legacy HAL_DATASPACE enums unchanged" into nyc-dev
am: 1e86e1ba1a

* commit '1e86e1ba1acfec7a16cdad8ab87f262e7bfc3e52':
  keep legacy HAL_DATASPACE enums unchanged