Merge changes I7e5de73d,I5b66c016 into klp-modular-dev

* changes:
  Build recyclerview with gradle
  Build leanback with gradle