Android 2.3.2 release 1
Merge "Volume keys need to be wake keys in order for them to work when the screen is off." into tools_r7