Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1