Don't require --debugfs and --tmpdir when --flattened is used. am: 3cb59a4e22
am: fada25c3e7

Change-Id: Ie4e7b780a2d900365c11d9b77a63181a880bfc82