CHG: [droid] refactor packaging to allow obb google extension apk