Merge "remove healthd.rc"