am 21773134: am 4477db78: CHERRY-PICK: propogate module tags for prebuilts

Merge commit '21773134b44f8d7c7177a60ca94181f2f51ac9c8'

* commit '21773134b44f8d7c7177a60ca94181f2f51ac9c8':
  CHERRY-PICK: propogate module tags for prebuilts