Merge "Don't build framework-annotation-proc with framework.jar"