Android-specific boilerplate changes