Merge "Doc change: Add diffs for API level 21." into lmp-dev