[automerger skipped] Merge "Add fallback case to layers_extensions.cpp" am: c3260262ae am: a78bdeb228
am: edc39e36e9  -s ours

Change-Id: I6345666e35e635fda4f8375a87ef4381c5335470