Merge "ART: Extract JNI macro assembler for x86"
am: c0362b5f93

Change-Id: Iea4afe81d5a52315c968947d5081973b80424e1c