Merge "Remove default libraries" am: 6c6b05c47a am: 86e940fdac
am: 6160339f3d

Change-Id: I3e6cc6c40bf5ca9a6fe6bab7604aadf0c9254fac