am 02e4bb6b: am cb5f9a28: am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules."

* commit '02e4bb6b10f33eb7ea54dbb6cffc20690fe9b18f':
  Define PRIVATE_TARGET_ variables for only target modules.