Updating README, and fixing build (again)

Change-Id: I8aefeb82e28c1bca82c5c27206bc1d060a09904f