Lollipop

Conflicts:
	BoardConfig.mk

Change-Id: I11af0574565f204f48e123d3d0adc0f5be89f999