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

Change-Id: Id587f968eea321254589a0d0f3cd5fc23be56739