Upstream changes to gonk-patches

Change-Id: I3b5167c22cead274ae53379ec3dc1cd538d29b19