am 82ba314e: Merge "SDK support improvements."
Xavier Ducrohet [Fri, 8 Feb 2013 01:59:06 +0000 (17:59 -0800)]
# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit '82ba314ec674f669f91561aab6b69741cb7dab26':
  SDK support improvements.


Trivial merge