AICPfy a few scripts

Change-Id: I924bc6529def277e72d9931134e77e610b92f6ea