Merge "64 bit stressapptest" am: c1551718dc am: 472b0bd37d
am: 13eed3cb06

Change-Id: I9b5e187884615a4b4dc715d70e05ade8cb9c7b34