* commit '6f1ee60033ba49365777776b05ef18d6d2e9cc50': fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()
* commit '6f1ee60033ba49365777776b05ef18d6d2e9cc50': fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()