Merge "Bump minSdk to 9 everywhere where it was < 9"