Merge "Replaced android.dvr.composer@1.0 with android.frameworks.vr.composer@1.0" into oc-dev