Merge "Remove default libraries" am: 5b5c2da95c am: 612e33d996
am: 72a6ea9e63

Change-Id: I250a75c3cff3b2f5ab23f5f3b0724bef3d7ec92a