Merge "Move com.android.cts.helpers.aosp to data so it's packaged automatically"