That file (a) was always forced upon you anyway and (b) no longer exists. Change-Id: I5964a0420e9114419b62d5b98e7ecef6c5b48296 (cherry picked from commit c2d4ae15fbbb4ebee364449cf9693566e10d07a1)