Merge "Convert external/flac to Android.bp" am: 9654326e6a
am: 8ce701e7b7

Change-Id: If02ca1b91f73d83ccf510158de97529b7a2241cf