Merge "Add the metalava_enabled property"
am: 69251fca46

Change-Id: I5720ce833d0ffd0016dc8a77cb0f56b0d34a9c21