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

Change-Id: Ie3269e263cb146a655217e348ae1cd5e146c7a91