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

Change-Id: I34ff23afb41fb25ec2df8cab5994663938407350