Merge "installd create_data_user_ce_path uses dir instead of symlink" am: f8af02fffa am: 21ea7683bc am: 906a243b4b
am: 4f23dd219d

Change-Id: Ibb02b9734bb58c893d92e18b66272f420f8cd476