Merge "Fix NPE in NinePatchDrawable, propagate theme in StateListDrawable" into lmp-dev