Also cleanup some unnecessary imports. Bug: 10360518 Change-Id: Id54aa4c9e3dff2bd354e3ebb83687b000842ea3f