Merge "Remove default libraries"
am: 06b7478f33

Change-Id: Id350cb3d50839062f7d8e900a028910640b596de