am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev

* commit '08924d007f2323b6fb57c858732d32b1083da639':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly