Merge "Merge "Add build target for generating navtree json with all inherited members." into nyc-dev am: 3d47dc03db am: 934755b5f3" into nyc-mr1-dev-plus-aosp