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

Change-Id: Iae4cc67435b84c868a446dc7ac16a618656bbdbb