Merge "Add compatibility check for (system|test_)api-stubs-docs" am: c9b01b87b1
am: 27892305d6

Change-Id: Ie6bd851d104a9334a92b452dded15989dc8506dc