Merge "Fix matrix dep on kernel configs"
am: a806c0c3bd

Change-Id: Ic65651aba65a1f00562a4edd5acc76a7303ed5f1