Merge commit 'b1387127f18b73d7f1038dad6e432329b78264ae' into gingerbread-plus-aosp * commit 'b1387127f18b73d7f1038dad6e432329b78264ae': Fix build (restore deleted assets).
Merge commit 'b1387127f18b73d7f1038dad6e432329b78264ae' into gingerbread-plus-aosp * commit 'b1387127f18b73d7f1038dad6e432329b78264ae': Fix build (restore deleted assets).