Merge "Add libhealthstoragedefault to make files"