Merge "Revert "Give pom2bp -default-min-sdk-version 24 param""