Merge "health.filesystem HAL renamed to health.storage" am: 15b9656ae9
am: e0a7888435

Change-Id: I26e80444b42a995d4f9f5d66373b7a0286d010b4