Merge "Add typedefs and nullness annotations."