Merge "Add product apk support from libnativeloader"
am: 23d774105e

Change-Id: I99f7ae5d0ca6b36eb6b57596ef83665c36904ff3