Merge "uapi: Add display-related uapi headers for Android compilation" into msm-4.9