Merge "Android.bp: remove x86 system tests" into main