Remove default libraries am: f74da7b95b
am: b95f0ce317

Change-Id: Ifb985b82795a1fae9f652ca8be3fccced533e376