remove unnecessary return statements

Change-Id: Ic9306170e1ff0ac8bd1bac0e8f18b9940f45fd10
Merge "remove unnecessary return statements" into android-4.4