[automerger skipped] Merge "Add fallback case to layers_extensions.cpp" am: 46e75a69e8 am: eac760d236
am: a29e519d51  -s ours

Change-Id: If09bc4521211abc30485dd94c9c469504fc89b6f