Merge "Remove default libraries"
am: 3f06d21426

Change-Id: If66ecb779035fe4719159e1308569f25bd23b046