Fix for bug 437414 - Annotation processing is broken when build is batched

Change-Id: Ib59d03fc00284b0ee5409f645e259c6324a3226e
Test for Bug 437414 - Annotation processing is broken when build is
batched

Change-Id: I520a0d21d86e25e7c2405e590740af68d657afe0
Signed-off-by: Harry Terkelsen <het@google.com>