Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev