Add missing default constructors (part 2)

The previous change (cf70b06c) only
added the missing constructor to the repackaged class not the original
class.

Bug: 119859108
Test: see above
Change-Id: I16a19786a6b0b5b317f4e9371ca24110a130224f