Commits
Chong Zhang authored and Adam Hampson committed b68d38e81fd
DO NOT MERGE change Surface constructor arg to 64bit Bug: 12799017 Bug: 12799384 Change-Id: Ic16b4fa5394df38cee0378b6e00d1808b9c8cb94 (cherry picked from commit af608e81d450b962a443a21fb1a6feadeb355fe1)