Apply upstream changes from android/kernel/common