Merge "Fix issue #6515427: Add android.hardware.television and fix..." into jb-dev