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

Change-Id: I2675c146cdfe9bb8cc023b717a5e847392dbe25d