Remove default libraries am: a24758f9a3
am: 080961093b

Change-Id: Id0e9cc0a9dee51b91daf9b6e0830ab2d560f08db