Add X86 support

Minor:
- fix typo in Makefile

Change-Id: Ib396b86fa9dfdfb7e8f5d2b369da14147ddf1f86
Merge "Add X86 support"