Merge "Remove default libraries"
am: 75bb9676e9

Change-Id: I6aa5f70043dd280d43368a251c18a9b62d4e912c