[automerger skipped] Merge "health.filesystem HAL renamed to health.storage" am: 15b9656ae9 am: e0a7888435
am: dff81bd879  -s ours

Change-Id: Ic6ac5ee9d497edfa29ebd274d1f03b1c69ec6e8a