Fix Android SDK build - again