[automerger skipped] Merge "Add product apk support from libnativeloader" am:...
[automerger skipped] Merge "Add product apk support from libnativeloader" am: 23d77410 am: 5ddcafbb
am: df3995d6 -s ours
am skip reason: change_id I8690167ca8098015c8ae4bbb4f028404c5e94dc0 with SHA1 cd8b96cb is in history
Change-Id: I52b3d5e1a9086cd489f210b8ac4d0acc92981d38