Merge "Update OBB sample to revised API" into gingerbread