am 01b87b29: Merge "Eclipse build updates"

* commit '01b87b29d97a49bba435d9f7b7eddb7691b7d2a9':
  Eclipse build updates