Bug: 36678371 Test: mmm system/libufdt, and success build Change-Id: I73059f5beca2242f8883fca86cb49d53d0f543b8 (cherry picked from commit 6ad4caae)