Merge "flounder: update kernel prebuilt am: 9dd9c97d95 am: a4f3c69c51" into nyc-mr1-dev-plus-aosp