Merge "64 bit stressapptest"
am: c1551718dc

Change-Id: Ia1287432ee21d0601a4dc10469065f28fd426bc3