Merge "Fix LibcoreHeapDumper.apk install path" am: e4731a1b7f

Change-Id: If66572063a41a82fce98c6b18521ddab93ee1e4a