Merge "Fix link-type check warning on PMTest_Java* test apps"
am: 779f561650

Change-Id: Iccbb6f4f98aece6ee8d5f41c95e5f0eb56bff94e