Merge "Pass the same fd when compiling due to boot image update." am: 4f8c1fd2ea am: dd4268dc5e am: 5e28b3ea17
am: 3e9c24f0ac

Change-Id: I5a9f561273f339b1e4243585d2cf3eecf47cad9e