[automerger skipped] Merge "Convert android-support-test to Android.bp" am: a7493439 am: f3968d0a -s ours am: d7cf9500 -s ours Change-Id: I1ab31dde1f1f5083b776064ce6405b7b47ceec34