Merge "ART: Add event callback support"
am: ed63aad1a7

Change-Id: Ic8517b91e9e37001df5bb319130243f32e54eca3