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

* commit '0ef5c5cb203eae0656f86e500274eb5bd856b88c':

Change-Id: I31ed0564c7d05be8fc845d883fa49824bc706cc9