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

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

Change-Id: Ia0ac286dacb71f60b941f63d426ef55e99741368