Merge "Remove default libraries" am: 6c6b05c47a am: 86e940fdac am: 6160339f3d
am: 54eb06316b

Change-Id: I0aae5438e9e856277ed79634abb9bf8906f7e9f5