[automerger skipped] Merge "Correct URL for testHTTP_H264Base_AAC_Video2" into nougat-cts-dev
am: 4c9e1f8d40 -s ours
am skip reason: SHA1 4c9e1f8d40 skipped by user aaronholden

Change-Id: I6a4d259ed060df0dbbecb0e56da1632c74054929