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