Bug: 37487472 Test: cd utils/tests;./mkdtimg_testdata.sh Change-Id: Iebc05c310a892c023d0c71862f267b083fd3a509 (cherry picked from commit 094c7b47)