Merge "Create legacy /data/system/user directory." into nyc-dev am: e4f870a
am: 2a9974a

* commit '2a9974a9682291f4e7dcbb2e940ac2e42a0d6c2c':
  Create legacy /data/system/user directory.

Change-Id: I20b29a6fb802966be184cb78534b4dd7d36eee66