Merge "Ensure layer update include the dirty rect from AVD" into nyc-mr1-dev am: a3c35852a1 am: a57431ce2b
am: 6dc767899f

Change-Id: I6a8dd81f8a292010dc798298c962e9ea5b06065d