Merge "Remove default libraries"
am: 5b5c2da95c

Change-Id: I4dff134a9bcf54e877fa53bcebf4e6d101c42afb