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

* commit '96a5482b75029129ebeecd543ca6683d2411b9a3':
  libdiskconfig: add missing LOCAL_MODULE_TAGS