Merge "Merge "Merge "Update CTS media file download URL" into nougat-cts-dev am: a7a9ca31f7" into nougat-mr1-cts-dev am: 81d7c082f2" am: 48ad4b982e
am: 85a0182caf

Change-Id: I5348e4a14b14bd241b5600167178ded6da44542b