resolved conflicts for merge of 3978da5e to dalvik-dev
resolved conflicts for merge of 3978da5e to dalvik-dev

Change-Id: Ieb1f2597928c6ab044b632c6db49c85ac24e1758

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst