Track own dalvik

Change-Id: Ifc049d3ebb7fdfc202e68a75ea1a698b4a97701b
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1

Conflicts:
	default.xml

Change-Id: Ic86ac21476c57f3534fde253d04bbdeb75ce1fbb