MERGED aarivera89/master into iFixitAndroid/master
Use unix line endings
Add missing imports and fix merge problems
Externalize main dimens from guide_step layout

No longer need layout_land.  Drastically better since the entire
layout_land/guide_step layout was a copy of layout/guide_step besides
swapping the height and width of the media and content containers.
XML formatting
Make videos actually work

This includes a major refactor to the GuideStepViewFragment which was
getting out of control with the introduction of new step media types.
Now it's much nicer and works a lot better.

Other changes:
* Added a loading progress dialog when videos are launched.
Externalize video progress strings
Tabs -> spaces
Fix play button position and main image spacing
Fix listview overflow bug
Don't include image right spacing on image steps
XML code formatting
Remove leftover debug logs

Log errors on video json parsing exceptions.
VideoSupport: Fix WindowLeaked error

Calling start and requestFocus on the video view before the video was
loaded was causing a windowleaked exception.  Waiting to start the video
till after the progress dialog was dismissed and the videoview was
prepared patched the leak.
Video: Add restart/quit dialog on video complete

Convenience dialog to make it easier for the user to restart the video
or exit the video player without having to tap back, or tap the video
and re-click play.
Lint recommended optimization
Embeds: Fix embed viewing
Video Support: fix video and embed in portrait
Video + Embed: Layout sizing fixes

* Fixed off by 2dp error when there is a full width image, video or
  embed in portrait mode.
* Float calculations, round down not up.
* Fix swapped height and width problems on embeds/videos sizing
Force video player to landscape orientation