Merge "Apilint: Enforce final builders"
am: 2886d307bd

Change-Id: I065ff3fede26d527860606ee60b2b6ca8a6d4fbd