Bring closer to latest native Android SDK refactor