Merge "Allow devices without AndroidBoard.mk" into gingerbread