support AOJP Common

Conflicts:
	device.mk

Change-Id: I5d92c9d5b3916117d3af88c97a7cb9f2d3abc57e