Move these files here so I dont have to sync vendor/cm anymore

Change-Id: Ie17dd204464f255bde5c91d8640ffa89f1f4dafc