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

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

Change-Id: I714d1a700625385d9758bee61b835953ea7bc75f