Merge "Camera: use framework header for VideoNativeHandleMetadata" into oc-dev am: d4fc468392
am: c9ec7cc179

Change-Id: Ibed3f21770a48478bd16610828f24181179e1ca2