am e0d0b18d: am 8e56a75d: Merge "Cleaning up folders for 7-inch and 10-inch UIs" into jb-mr1-dev

* commit 'e0d0b18de077233908da128d61c2b020f9ff527a':
  Cleaning up folders for 7-inch and 10-inch UIs