Merge "Get PORTABLE + SMALL on x86." into dalvik-dev