Merge "Add option to generate DEX signatures of private API" am: af0a04c601
am: 26659e396c

Change-Id: Ic1273add1a95979bd1e7a2bc1f49d9893aa66354