Merge "Enable lint_as_errors for frameworks/base docs" am: 6622d0957d
am: dd298a4b0f

Change-Id: I0aa3f754d172c4d07c55cc04cac03744b9183e58