Use correct battery capacity, add missing eri.xml
Add missing properties, relax bootloader checks

Change-Id: Ide226c5dfd3653a8e88ff05545de45b6362dd5da

Conflicts:

	board-info.txt