Merge change I0a17a960 into eclair

* changes:
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.