am 99a20369: Merge "mako: enable 4-layer MDP composition" into jb-mr1.1-dev

* commit '99a203695904272a8460020fd1c08600631aa62a':
  mako: enable 4-layer MDP composition