Merge "Revert "Replace framework-annotation-proc java lib with framework-all""