Merge "Fix genHiddenConstructor missing @hide"