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

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

Change-Id: Ib3a571f040cf7280e0d2fd771d9ffb16ecda6f66