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

* commit '50c548c8f4e0df0c3a04e2b1cc91d79e067d940e':
  Don't modify LOCAL_MODULE_TAGS.