Merge "Merge "Close file descriptors of ProfilerInfo" am: fedc8278 am: 50eb1bce -s ours" into pi-dev-plus-aosp