Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"