Merge "Rename android-M to android-23."
am: a21dd542fb

* commit 'a21dd542fb9129a36d94aef1370ba71d4f82ca7e':
  Rename android-M to android-23.