Merge "Fix divide by zero for non-arm processor am: 69220926eb am: e4dcf4bc14 am: 03d2049bf4 am: e55b2e452c am: c7d59c1a09 am: 4192a3115d am: 69fcab7d4c am: 760efd33c7 am: 528bf3fda2 am: 54e63ce680 am: a7d07e4608 am: 5143ca77ae am: bd8c9499f0 am: 2706c5c647 am: 8666e355b6" into nyc-mr2-dev-plus-aosp