resolved conflicts for merge of 2724776a to dalvik-dev
resolved conflicts for merge of 2724776a to dalvik-dev

Change-Id: I7f55e92b7d4d2c57812bc6eb7daa7bb5b77cacc2

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