[automerger skipped] Merge "Remove update scripts for VTS makefiles." am: baafbbcf19 am: 5375f1f87a
am: c8acc6c4cc -s ours
am skip reason: change_id If07460e1b88c5929e23256c30ddb332ee64e9c3d with SHA1 0eea29beaa is in history

Change-Id: I096b9d307db183534a41a9a97075b33cca2fe948