Merge "Replace framework-annotation-proc java lib with framework-all"
am: f1083db49e

Change-Id: I49fbeb2557c541d61b3034cbfdb6bf54cea2e677