Merge "Enable specification of media file location" into nougat-cts-dev