Merge "Modify make files for talos and trinket. -talos: enabling hw recovery -trinket: enabling hw recovery and removing virtual display.           removing hardcoded wide_color_display"