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

Change-Id: I3ce9d9625a377dfccc2e4edd6d107584544be9bf