Merge "Remove unsupportedappusage-annotation library." am: 7d84e11495

Change-Id: I94b5b2f5d2d0ad1a01eed600c9d1979cd3dfe2ff