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

Change-Id: I70037ad9ed5b8e8586dbbfb240bdf01d4fb11130