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

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