Make the patch apply again after NSS update

Change-Id: I935188ee90b4c56c5a4d7cc374a26e4b182beb5f
Cross-compilation fix

Change-Id: I205afbd9c1cbe3a286359036cbdcf6aa9d986f71