Remove default libraries am: 37cf022706
am: 47386c666a

Change-Id: I190f289c3d408b6491fbe885a11c71e583f415a7