Merge "stagefright: rename VideoGrallocMetadata.hHandle to pHandle" into mnc-dev