Merge "Filter removedApi file by package" am: de398aab7c am: 530b6219b0
am: c9b27da2da  -s ours

Change-Id: I2d0083811077fa96173a8e0e0dec2ff566c0a6e0