Merge "android.view.Surface: Add parceling warning" into nyc-mr1-dev
am: 0656931d18

Change-Id: I763c8c9e807e6cd28879ff47817471c21ad45798