Merge "Merge "Use stageFile() when preparing media files." into qt-dev am: 2ec1b4e919 am: e21d005257" into qt-r1-dev-plus-aosp am: 8dec3071ee
am: 29976af115

Change-Id: Ida8d479c09a0ca4e7923f573040d6f26a3e47b94