Merge "Revert "Add maxTargetSdk restriction to unused APIs.""