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

Change-Id: I8bd94da6260242e6f7ed0f9dd76b43ba25e08f19