am b7f1f61f: am ee923139: Merge "Set up user directory crypto in init." into mnc-dr-dev
* commit 'b7f1f61f':
Set up user directory crypto in init.
logd: switch to unordered_map from BasicHashtable
rootdir: make sure the /oem mountpoint is always available