[automerger skipped] Merge "Remove superfluous use of no_framework_libs: true" am: ee7baf72cf am: bcf1f88f32 -s ours
am: 6216eecba6 -s ours
am skip reason: change_id I2777e8f9da0c7e0f3fc84277600f9db45b2f837e with SHA1 d93f565421 is in history

Change-Id: I2627c6fb9fcf8beb941a8d28e87003eadeb2930b