Merge "Use stubs generated by build system"
am: 9eb4b69c5b

Change-Id: I7a77b604a561c9e5c81526883d4fdf84771b57ac