Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev