Merge "Dont include day/time or ldap for eng aapt2 builds"