Merge "Create subdirs in system_ce/ for multi-user backup" am: 625203444b am: 33a5634374
am: 2506860cfb

Change-Id: I116438108a176deb90eaf724ac8ddd66d597a129