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

Change-Id: I8c3929e8c7702dc126aa11c27cb9a36d0a9535b3