Remove default libraries am: 813ae86194 am: 8486cd9f5a
am: c07bf79b66

Change-Id: I2afde86e1c54fad49819aa959225f64fb9432967