Merge "Dropping CTS v1 targets" am: 8cb2270f4e
am: 8af49e638e

Change-Id: I6617cd3751672fb9fb19baf350617298203e2459