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