Update to compile with newer versions of Android

Cupcake? Seriously? No. Absolutely not. No. No. No.