Merge "angler: update prebuilt kernel [ DO NOT MERGE ]" into nyc-mr2-dev am: db9df6e20f
am: 39bc332309  -s ours

Change-Id: Ib1c983e84ec528fe98dec57fba3ee725845de40a