Merge "Remove clang-4053586"
am: aaee95c82a

Change-Id: Iba64409d387799e6bd29c0431e6203df09909f6d