Merge "Remove default libraries"
am: b20cc6ffbc

Change-Id: If09c8db176fe709c05637054f76085cc38116de9