Merge "Add newline in generated Android.bp files" am: 8076909d3a
am: 652aaeb211

Change-Id: Iaa3957dc52fc9ed178cd73589b679bc87d870273