am 9ef5950c: am 01b87b29: Merge "Eclipse build updates"

* commit '9ef5950c750b322ed4a652a34b5a9b2c6d9f5edc':
  Eclipse build updates