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

Change-Id: I854208da77dd30445d1e3886f5caaeaf6967c1a0