Remove default libraries am: 813ae86194
am: 8486cd9f5a

Change-Id: I12c2336f1b826d4cb9d119f99de5b9c7ca5d06b6