Merge "Snowball: init.st-ericsson.rc renamed" into linaro_android_4.0.1