Merge "Fix LDPI Torch layout" into gingerbread