Merge "BasicMediaDecoder: Use new build system" into developers-dev