Merge "Add the stub src dir to the leanback extras." into klp-modular-dev