Merge "Fix libart.do boot check failure (b/11679102)." into dalvik-dev