More improvements+Additional prebuilts

Change-Id: I9fc6e7ee0a481382f08fdc96060783442389f1e7