[automerger skipped] Merge "Replace framework-annotation-proc java lib with framework-all" am: f1083db49e am: 99aac54513
am: ba366fd805 -s ours
am skip reason: change_id I449488cba235211374e2825df97aae84395e60b6 with SHA1 0b5eb9a486 is in history

Change-Id: I74a78512709ab0fc838c282ccf95f9cde378a631