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

* commit 'f161d11ea16435697a3abf9a78ad0851565a52bc':

Change-Id: I9111402e344fe278ac8974632801c28ac86e9553