Merge "Revert "Replace framework-annotation-proc java lib with framework-all""
am: 546f68a66f

Change-Id: Ie28ad6fd9943846fdd74236a43c65adafc4028fa