Merge "Merge "Update CTS media file download URL" into nougat-cts-dev am: a7a9ca31f7" into nougat-mr1-cts-dev am: 81d7c082f2 am: 2101285d9b am: d1320ba80a am: cf9c0af676
am: cc2be11823

Change-Id: If01b9e8e440d6aebbde27c2871b4702353dd22da