Merge "build_image: Increase spare inodes to 12."
am: aa58210dd0

Change-Id: I4ff9d44984e043c88c31be523297330a20c4e12f