am 89ac2e10: Merge "change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime" into ub-camera-glacier

* commit '89ac2e10477b03fbd5addb7da46933626748ed3a':
  change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime