tenderloin:  Fix up 4g wifi

Conflict in gpio

Change-Id: I09d30c0688b2ac0e13afc4e94641ac10253e73a0
tenderloin:  Fix up rotation for the 4g Model

Change-Id: I66554ee99a3c61ad653d6121f3d4a0cf6e055570
Merge "tenderloin:  Fix up 4g wifi" into kitkat
Merge "tenderloin:  Fix up rotation for the 4g Model" into kitkat