Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4ed am: e477a54c8d
am: 6bec66849b

Change-Id: I65ac28ca11d566fb73288940e954faacd378354c