am 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"
am 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"

* commit '3aa4de11b05599d75af92a15820731144941c38f':
  Fix element size on 64b

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