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

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