Merge "Android.bp: neon has been always-on for years now." into main