Merge "Fix the order of suffix in Android.bp" into main