Remove default libraries am: cddc2024e9 am: df754c8525
am: ed2d7c062a

Change-Id: I664eeeb4d931328e5660e9de1daab338f5f9962b