Merge "Update to allow x86-atom build for FI on Gingerbread"