[automerger skipped] Merge "Add product apk support from libnativeloader" am: 307df45b5f am: ad0ca523a6
am: 453a487b29 -s ours
am skip reason: change_id Iaa8d0ea61b1b9ab8a1da676a492f75c6a5d71d5d with SHA1 cfc8da11f6 is in history

Change-Id: Ie75c4519d6b1341fbd8b0992009add4eef913d85