am 8b4be231: am 8e6f821e: Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp

Merge commit '8b4be231519376c9dc73622be4b8a5ddc0d83805'

* commit '8b4be231519376c9dc73622be4b8a5ddc0d83805':
  Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp