am 0c218aca: am d03ee772: Merge "Restore overlay support for RGB565 layers" into klp-dev

* commit '0c218acabced1726f66b3a19f88e20460cc96547':