Merge "Revert "Reject apks targeting deprecated sdk""