Merge remote-tracking branch 'b2g/b2g-kitkat' into next/aosp/master