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

Change-Id: I1cd00bfcea2e113a16c6b032eb457758599123fc