Merge "Remove default libraries" am: b20cc6ffbc
am: 7368b91323

Change-Id: I8ae8ad0744bbe693c4718596df366eb0679336ea