Merge changes I2104037d,I125c4a00 into klp-modular-dev

* changes:
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.