am ddf25bba: Merge "Updated Holo test assets for JB MR1" into jb-mr1-dev

# Via Android (Google) Code Review (1) and Brian Muramatsu (1)
* commit 'ddf25bba6932ffacc0ff6ffc22162d6707e69d40':
  Updated Holo test assets for JB MR1