Merge "media: Write maker and model information into recorded videos." into oc-dev am: c7205dc331
am: bd072244aa

Change-Id: I06daa6573a9951dfaa03c06525116278f93df0e5