Merge "Clarify the AOSP issue tracker" into jb-mr2-dev