Merge commit '60714539ad896a548c4b0c0b42afc61447cb6e2b' into eclair-mr2-plus-aosp * commit '60714539ad896a548c4b0c0b42afc61447cb6e2b': fix [2153873] EGL-1.4 software implementation misses surface attributes
Merge commit '60714539ad896a548c4b0c0b42afc61447cb6e2b' into eclair-mr2-plus-aosp * commit '60714539ad896a548c4b0c0b42afc61447cb6e2b': fix [2153873] EGL-1.4 software implementation misses surface attributes