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

Change-Id: I31741b3f6ead4a9468b56f779e459d76b3029537