Merge "hwcomposer: Add HWC_BLIT compositiontype value" into jellybean