am 681c5ff2: Merge "Reverse the default setting of...

am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread

Merge commit '681c5ff2' into gingerbread-plus-aosp

* commit '681c5ff2':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.