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

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

Change-Id: Ie35bb280a99ad4738c35ac0bad0192e221b74ca6