Restructure the contents of art/test/Android.bp. am: 962a110efb
am: 75f0848245

Change-Id: Id613662c8a4bfd488dddd610273cc453f8acc3ad