Merge changes I82cecd20,I2b4e41a4 into rvc-dev

* changes:
  updatable-media: Set min_sdk_version
  Set min_sdk_version to be part of mainline modules