Merge changes I2667b6f5,I8c83c6b7

* changes:
  RELAND "codec2 hal: move directories around"
  RELAND "codec2 hal: Codec2ConfigurableClient to take HIDL or AIDL base"