Remove default libraries am: 5577f8a5b2
am: 7bbed5c020

Change-Id: I905de6a22514fd895ab7a7b7cf737bd7d27a46e7