Merge "Remove default libraries"
am: bbe7bb92ee

Change-Id: I2d72f1b73ccff3fd6656a42ab42ee739c8191e0c