Merge "Add product apk support from libnativeloader"