Update framework code after new ART options.
Update framework code after new ART options.

Change-Id: I852a5975701653fe7e0cdd02e3c0b30a2b0b0b59

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base