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

Change-Id: I38739a4f2f7bdb3da64e70cfa5f098039ef129fa