am 25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."

* commit '25a16fe80ee7795c4763045061779f3c7068813d':
  Don't modify LOCAL_MODULE_TAGS.