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

Change-Id: I0c6d4fedd1c02b45eda9cc46d675ffe40266bfa6