Merge tag 'android-8.1.0_r29' into oreo-x86

Android 8.1.0 Release 29 (OPM4.171019.016.C1)

diff --cc media/libstagefright/StagefrightMetadataRetriever.cpp
Simple merge

diff --cc media/libstagefright/include/media/stagefright/MetaData.h
index 577bc77,f2113f4..14f3f95
--- 1/media/libstagefright/include/media/stagefright/MetaData.h
--- 2/media/libstagefright/include/media/stagefright/MetaData.h
+++ b/media/libstagefright/include/media/stagefright/MetaData.h
@@@ -237,9 -215,9 +237,11 @@@ enum 
  
      kKeyGridWidth        = 'grdW', // int32_t, HEIF grid width
      kKeyGridHeight       = 'grdH', // int32_t, HEIF grid height
+     kKeyGridRows         = 'grdR', // int32_t, HEIF grid rows
+     kKeyGridCols         = 'grdC', // int32_t, HEIF grid columns
      kKeyIccProfile       = 'prof', // raw data, ICC prifile data
 +
 +    kKeyArbitraryMode     = 'ArbM',
  };
  
  enum {