Merge "Replaced android.dvr.composer@1.0 with android.frameworks.vr.composer@1.0" into oc-dev am: f4c0009bf9
am: 2ad9b943fd

Change-Id: I7997309f7989967144f54b2eb3717b5b9a9fb4d0