Merge "Revert "U-boot firmware for the Edison"" into brillo-m7-dev