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

Change-Id: Ibc69d8769f43e98f60a679bbc0804f62db0e4716