tree 2c1bed74b47e4129add2ea0c8e5158bdd35ce96a
parent 1b0044bb9a92cd90a59dae1786640411e40ca3f3
author Ed Tanous <ed.tanous@intel.com> 1532721862 -0700
committer Ed Tanous <ed.tanous@intel.com> 1533839573 -0700

Fix merge conflict

Got a couple patches that collided in air, and now builds are broken.
This resolves the collision by moving the new patches forward to the
latest #defines

Change-Id: I1fe35d17a68c61ad90752ae73000e2579131bf5d
Signed-off-by: Ed Tanous <ed.tanous@intel.com>