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

* commit '1b59b815bab116d11347011791c020981432a99d':
  Create legacy /data/system/user directory.

Change-Id: Ib1983ee798a81b316d055cf2f8c9a239bdfd1253