Merge "Add null checking on NuMediaExtractor::getMetrics()" into qt-dev am: a9f592f1e8
am: 39d855af49

Change-Id: If8efcba3df6b1b16a7509b8f8a1bcb43c9df1533