am 22a994d1: am 854e16af: Ensure sample runs on Gingerbread.

* commit '22a994d112ecd11254a948b4e976b9e09e22d3f7':
  Ensure sample runs on Gingerbread.