Fix build issues with external patch.

Change-Id: Ib5ea4338df179eb27e4ce9958ef42df1e3ac3eb1
2 files changed