am d87aac1d: (-s ours) am f700f215: (-s ours) SDK / support lib update to build #2239354. DO NOT MERGE ANYWHERE

* commit 'd87aac1d9bf733c35210eda916df7196d6e36ca7':
  SDK / support lib update to build #2239354. DO NOT MERGE ANYWHERE