Android ADT 0.9.8
merge from open-source master

Change-Id: Ic9add408166bf9a0350db904e15912b723e55a15