Merge "AppCompat drawable updates" into nyc-dev
am: 5d92ff3f3b

* commit '5d92ff3f3b032aed483833eade397fbf13748493':
  AppCompat drawable updates