Merge "Refine testcase to fix inconsistence between portable/native header."