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

Change-Id: Ida1555d0818c5d8e2a3cf22b5f6f787587216b9d