Merge "Use HWC_DISPLAY_PRIMARY and _EXTERNAL"