tree 3b935887be63b6389bc8e84e2009bf3bb04e3b81
parent f1b764bf4bd7da8edf128fa57456a31e067d14c3
parent f35417c4eafcc9770861cf72d16b2325f29873cf
author Paul Duffin <paulduffin@google.com> 1484753229 +0000
committer android-build-merger <android-build-merger@google.com> 1484753229 +0000

Prepare for removal of legacy-test from default targets am: 85d64f51c5 am: 845263139f
am: f35417c4ea

Change-Id: I5cc61cbf428fa3495d9e8dc8729bdb982ec6814c