Merge "Stop reading the generated ojluni sources in droiddoc."