Merge "Clean up deprecation tags in support libraries" into nyc-dev
am: f7bdb2b

* commit 'f7bdb2b37497128b8a9108eea43c17ea544c957a':
  Clean up deprecation tags in support libraries

Change-Id: I5e62b6c0b0bf55a2e45f81bb533bdca4f085940f