Merge "Remove default libraries" am: 75bb9676e9
am: cbddbe8225

Change-Id: Iba153cb172221d4b65b3cdab1526d0773fac77cc