[4.4] Upgrade files to 4.4 and reapply one-liner custom patches

DO NOT COMMIT until Bugzilla has been upgraded to 4.4.

Change-Id: Ib49a5cfa14f2a80a21154869968a9a869c2b3108