Merge "Pass the same fd when compiling due to boot image update."
am: 4f8c1fd2ea

Change-Id: Ifbc81ad7ffebdcb2eb40e279c558899ec1dce505