Merge "Remove default libraries" am: 75bb9676e9 am: cbddbe8225 am: 4f9ab495a2
am: 6286386390

Change-Id: Ife67f65a9d1d34852f193683b23926266330b5a4