Merge commit 'c461d946f0da13e1945f093fd2628abf9c07d5a9' of sso://googleplex-android/platform/system/tools/mkbootimg into HEAD
Change-Id: Id9f4474933bf838b22c4b862ede1ac74393e5d06
Ignore-AOSP-First: Internal projects only