Merge "Remove libcore Make based droiddoc target." am: adf0160abd
am: 899c09d9ac

Change-Id: I2e33bdc56b29a5b3922acebf3b589d988f91267a