Ignore 12496bfc into jb-dev-plus-aosp

Change-Id: Ibd43b178907f547e87b4a6b0608a676b649a236a