am 9684a7fa: (-s ours) am 9b737e0e: DO NOT MERGE Rename folders for 7 inch tablets

* commit '9684a7fa51b91393b5259892e76b5a1ffa3b30b9':
  DO NOT MERGE Rename folders for 7 inch tablets