Merge "ART: Forward-declare Context"
am: 2d22ffce2b

Change-Id: I0b081189e9165b2ffdad08bade7c885920bb8de3