Merge "AChoreographer: Avoid potential NULL dereference" into rvc-dev am: 01ab4a277f

Change-Id: I3f4f1d4809d59394285f7c286a7f3f3014221161