Merge "Create appcompat data dir"