Unflatten edk includes

Installing the edk headers into a folder requires us to do odd things
with imports, and either include headers with "..", or otherwise get the
include directories lined up.

Move the contents of edk/*.c/h up a level, and just simplify the include
structure.  This is done to fix the immediate change of the prior patch
and make this build again.  Happy to discuss other options.

Change-Id: I328f20bca6d23100993493445bee0e5e11d2866a
Signed-off-by: Ed Tanous <etanous@nvidia.com>
diff --git a/common-utils.c b/common-utils.c
index a473b6a..c26f046 100644
--- a/common-utils.c
+++ b/common-utils.c
@@ -5,7 +5,7 @@
  * Author: Lawrence.Tang@arm.com
  **/
 
-#include "edk/BaseTypes.h"
+#include "BaseTypes.h"
 #include "common-utils.h"
 
 //Converts the given BCD byte to a standard integer.