Merge "Switch to metalava for dalvik/ docs"
am: 23bc16e71d

Change-Id: If6cadc75ae45ef2c957280a2fe999f8ae00d0484