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

Change-Id: If3d7d2330eb4d83c093a96651601a132c9420e33