Merge "Don't duplicate default platform libraries into proguard flags"
am: f7b6bf8cb1

Change-Id: Ie0320268dcd5c751570fe333f0e32cfdd7c81524