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

Change-Id: I4e97594663b711f18a3940e002fceac215575d1c