Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev
am: 4c25f3dd43

Change-Id: I2e239c4c1e5d28952b95f1299daf8ac793cc7e0c