Merge "Revert "Revert "Remove libcore Make based droiddoc target."""