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

Change-Id: I896f609e4994eb6b0494e3fcf38737c4a69352a8