Merge \"ART: OneBit intrinsics should use 1ULL for 64-bit shift\"
am: 1e28d1e145

Change-Id: Ifca8f91f444537704477824a52ae50309db93858