Merge branch 'kitkat' of https://github.com/AOSPA/android_build into kitkat

Change-Id: Ide23c9a280d6524066725dcf9d2021ca7038d211