Merge "Fix the unit test for header-abi-dumper -print-resource-dir"