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

Change-Id: I2fe7b5ebfea0216808b721a76eb816106b56e0cb