Merge "Add product apk support from libnativeloader"
am: 307df45b5f

Change-Id: I1f9c9e63c1cf7477436b8bc38e5e62e075183c64