Merge "Add dependency on android-support-annotations"
am: 9f014f67b1

Change-Id: I3f7bfbb784d2ace4158d535490edb2580861ea18