Merge "Fix link-type check warning on PMTest_Java* test apps"