[automerger skipped] Merge "Revert "Replace framework-annotation-proc java lib with framework-all"" am: 546f68a66f am: 06fa6a7e21
am: f02d014ab2 -s ours
am skip reason: change_id Ic6997f7b83318fa5d0c819c197cb5965adc31347 with SHA1 9718349faa is in history

Change-Id: I0bd87eeee302bb867310852c5b0a72c0962fab13