Merge "Add method to explicitly create Surface. am: 4e623e259c am: 84051d9c97" into oc-dr1-dev-plus-aosp
am: 6de331a349

Change-Id: Ic4ccdeff08c15b79ff148949d1633a28594f293a