Merge f17f2691fa1d55d4a1f214d2907378b6c1b2656d on remote branch

Change-Id: I940c981325b4bd4fe7bcd081d5bad6b332e0df3d
diff --git a/media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp b/media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp
old mode 100644
new mode 100755
diff --git a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
old mode 100644
new mode 100755
diff --git a/services/camera/libcameraservice/api2/HeicEncoderInfoManager.h b/services/camera/libcameraservice/api2/HeicEncoderInfoManager.h
old mode 100644
new mode 100755