Merge "Remove default libraries"
am: 597fad5556

Change-Id: I82493ee6f7e3aa257ccae0d0c2fb53d93f16996d