Merge "Update version to 24.0.0 and R33" into nyc-dev
am: 287f123dc1

* commit '287f123dc1eb175b19e420acdce2128e542bc69b':
  Update version to 24.0.0 and R33

Change-Id: Idf5be7e87b40e6054fe9b277d3beae651eaa07e2