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

Change-Id: Ie888266def019012e15436db981f5cba87757dce