am fd6f3872: am 2985f81d: Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"

* commit 'fd6f38727e3be7d5d9163698b06d61656b2bbe4d':
  libdiskconfig: add missing LOCAL_MODULE_TAGS