Merge "ART: Expect a null self in SetEntrypointsInstrumented"
am: b07d20b9dd

Change-Id: I7f144dafd03aa8d947c48444e865ab7a0819f0e8