Merge "Remove Metalava related targets in development."
am: 1594b2db03

Change-Id: I089002ebf676f03b68b3cca82e7151f3e9b43a09