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

Change-Id: I996ab33bafcba4480a99d81496864d5157bda316