Bug 905315: Work around android ADT path naming scheme change; r=nalexander