Also remove what appeared to be an unused file which caused the lint tests to fail. Change-Id: I5c70bff21b54f3fd5b2c1744e71f7bbfb3f23a52