Merge "Move modules in compatibility_matrices/Android.bp" into main