Merge "Merge "Fixes documentation of external-path tag" into nyc-dev am: 24bbc513f2 am: 50316fb01c" into nyc-mr1-dev-plus-aosp