Merge "Remove default libraries" am: 8b7feee38f am: a0113de2f3 am: 55181f7cdd
am: 2c6b2ebe7c

Change-Id: I88c97a99afa3a3aabf5d376052893578a7232cb2