Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev