Merge "Generate new API signatures from doclava" am: fa208b4226
am: 72b7f03179

Change-Id: I7dbf94c493bc79f4200afc45e6ed58543359c9ff