Remove default libraries am: dfc348fb2b am: 6ea7417777
am: 9e2a5fd924

Change-Id: I782eebe0574ecba91c7ccce4e8a489b7966d1f40