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

Change-Id: Ib6aeaa402786520594f5c68d08e1de58787da443