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

Change-Id: I5873f9b327f41c78d6694f06e4cedaed0e64ba3d