Merge "Add newline in generated Android.bp files"