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

Change-Id: Ia0eee918b5094278d929f06005fb373219ebd37a