Merge "(DO NOT MERGE) media: Don't wait at MediaRecorder::stop() if we haven't received any frames." into oc-dr1-dev am: 0f96fc772a
am: 7342d0939a

Change-Id: I452de368e7387cfd5ca2ee1b833e877023bfc035