Merge "installd create_data_user_ce_path uses dir instead of symlink"