Merge "Add options to work in a subdirectory." am: 407bf744c1 am: 77dc5d2ede

Original change: https://android-review.googlesource.com/c/platform/development/+/1371530

Change-Id: Ia83ae7d9322d2071b2f4d54526723891a67cb9f8