Revert "Revert "Remove unused apache related API.""

This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
Merge "Revert "Revert "Remove unused apache related API."""
Add java.util.List import.

Unused on master but used downstream.

Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
Merge "Add java.util.List import."