Merge "Remove default libraries"
am: 6c6b05c47a

Change-Id: I16e9d8a83b44453c625b3a8929f36b93161fba9d