Remove default libraries am: dfc348fb2b
am: 6ea7417777

Change-Id: I395e92856609753f068a68f92efe3632a4e79c09