Switch back to aosp clang

Change-Id: Ie27f39979f7465012eeb16d90e099dfc411ea66f
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Merge remote-tracking branch 'slim/lp5.0' into ose