Merge "Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am: 9a3132d065 am: 4b7a6339cf am: cfd06fdc14  -s ours"