Merge branch 'stable-2.11' * stable-2.11: Add ASM dependency for standalone buck build Change-Id: Ia7cd0f9596dbd988a3a1adb5f5968de9092dad9d