Merge "Added libstagefrighthw as dep for camera"