Revert "Revert "Set cpu_mode/cpu_model for E\ models""

This reverts commit d34bbc5419b12135de16038b4b13758f3ab615eb.

Change-Id: If92b128a83ba6b336a5f2a774201c5ac59ebf0f2
4 files changed