am acbf1acf: Merge "Fix Broken MediaRecorderTest#testSetCamera" into gingerbread

* commit 'acbf1acfbf0ca165981c301fbf1627392d911a97':
  Fix Broken MediaRecorderTest#testSetCamera