am 2bb3ea1: Fix native core runtime. A messy declaration was causing a p
am 2bb3ea1: Fix native core runtime. A messy declaration was causing a p

Merge commit '2bb3ea162a58c0f1dddccdbe68b64e02456f11f9'

* commit '2bb3ea162a58c0f1dddccdbe68b64e02456f11f9':
  Fix native core runtime. A messy declaration was causing a problem at boot time.

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