Merge "Add a trailing new line to Android.bp"