Merge "Remove default libraries" am: 597fad5556 am: d8c570dc78
am: 36902920fe

Change-Id: Ic537e1c396fcf9a84add5b49c449e971f3da2b82