Merge "Fixed formatting on services/Android.bp" into sc-dev