Revert "Revert "libhwcomposer: Don't count video layers marked for SKIP""

This reverts commit 5b9ee9522eff9f43eb13692e2d15f8d500b680a2.