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

* commit '2985f81d0dfa0e3ff790cb7637684b3919a6ca1c':
  libdiskconfig: add missing LOCAL_MODULE_TAGS