Remove the need to copy & paste boilerplate.

Change-Id: Ie21a0914f430afc76e605b9d69257aec5003e41d
Merge "Remove the need to copy & paste boilerplate."
Merge tag 'android-4.4_r1' into jellybean-mr2.1

Android 4.4 Release 1.0