Merge "installd create_data_user_ce_path uses dir instead of symlink"
am: f8af02fffa

Change-Id: I22a693a5bf288876413bbb3b1dfe2c364944deaa