Track CM's android_sdk for more java 7 fixes