Merge "Fix userdebug build."