Remove unnecessary include and library am: cdeff9625d
am: 007dcd0be4

Change-Id: Ia8827457fc622252e9ce816583745e5e24f9eef5