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

Change-Id: Ia369e201d6e33c305090f36ff89f54242af82ee9