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

Change-Id: Iecc178fbf24c6f4f2a055c31b5cd67aa02175225