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

Change-Id: I36a46b1dcdd7cf6963eae1fb5e28838ed6d3b468