Commits
Chong Zhang authored and Narayan Kamath committed b215529c720
change Surface constructor arg to 64bit Bug: 12799017 Bug: 12799384 (cherry picked from commit af608e81d450b962a443a21fb1a6feadeb355fe1) Change-Id: I8d1471b16e6a6d334a3a32b789045eb171b81e03