Merge 'stable-2.12' * stable-2.12: Build with API version 2.12.4 Change-Id: I9dfe6edc4f91c0fc611d216cbed994788e5db598 Signed-off-by: Edwin Kempin <ekempin@google.com>