Merge "media: don't rely on Java 6 parseInt error on leading '+' sign"