Merge "Revert "Use cil_write_build_ast"" am: 284d756b20 am: 7e83cf42eb

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1832308

Change-Id: I91a2373fb3d4ab7ef4993f123c3e7d185656ed51