am 8639f2dd: am 3057adba: Drop the [no]proguard. prefix for the intermediate targets

* commit '8639f2dda202507ea93c48ee46d5ea89c47a2c5c':
  Drop the [no]proguard. prefix for the intermediate targets