Merge "Work on SMALL_ART and PORTABLE working at the same time." into dalvik-dev