Merge "Stop reading the generated ojluni sources in droiddoc." am: 8ab61fb0dd am: 493a6bddf1
am: 1d44a65df9

Change-Id: I00155038e50cbe3704f34085f79721d19bdbf534